Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 14 Apr 2010 22:47:29 +0000 (22:47 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 14 Apr 2010 22:47:29 +0000 (22:47 +0000)
commit067ef71fcb987cad1f73e505fe63e378be7741a0
tree9833e1c56f56371d0b0804daca20f433358f38a0
parente16c5b3298a5c2501002e72888ff106f97d7c3ce
parent390504dd489da63a7c848a93c819c7487a20ef83
Merge from mainline.